mir: try mir before x11
authorWilliam Hua <william.hua@canonical.com>
Fri, 10 Mar 2017 15:50:23 +0000 (10:50 -0500)
committerWilliam Hua <william.hua@canonical.com>
Mon, 13 Mar 2017 02:40:04 +0000 (22:40 -0400)
gdk/gdkdisplaymanager.c
gdk/mir/gdkmirdisplay.c

index 2950d805208446e5bb64b4cbd030818b2e701e31..2bd670f399c07c6ad67e00c582263b19badcaa4d 100644 (file)
@@ -272,12 +272,12 @@ static GdkBackend gdk_backends[] = {
 #ifdef GDK_WINDOWING_WAYLAND
   { "wayland",  _gdk_wayland_display_open },
 #endif
+#ifdef GDK_WINDOWING_MIR
+  { "mir",      _gdk_mir_display_open },
+#endif
 #ifdef GDK_WINDOWING_X11
   { "x11",      _gdk_x11_display_open },
 #endif
-#ifdef GDK_WINDOWING_MIR
-  { "mir",  _gdk_mir_display_open },
-#endif
 #ifdef GDK_WINDOWING_BROADWAY
   { "broadway", _gdk_broadway_display_open },
 #endif
index 9dccb32bd60e7c908f269977de9eaedeb7ce2229..25a3a03e6736676bfe1499a2aa5e3054119136f0 100644 (file)
@@ -183,7 +183,6 @@ _gdk_mir_display_open (const gchar *display_name)
 
   if (!mir_connection_is_valid (connection))
     {
-      g_printerr ("Failed to connect to Mir: %s\n", mir_connection_get_error_message (connection));
       mir_connection_release (connection);
       return NULL;
     }